Revert 9e6d775..b1d3d5f

This rolls back to commit 9e6d77536d3c6eae71d3d2aa3cf79f2e28d2d6ab.