This reverts commit d9a1faaa9c. This was originally part of a larger PR that has now been closed as a different approach is taken now.
d9a1faaa9c