Reverted commit that broke the build