Revert #1163 until decision made

Reverting change made in #1163 as it broke the build