WIP: Revert 948b667d

Open Cameron Rough requested to merge revert-948b667d into master

Merge request reports