Revert 9290ce7..86e3004

This rolls back to commit 9290ce77eec5ff75055be7c87b10dd3789178949.