Revert c118cb8..a68b2da

This rolls back to commit c118cb883cd8a3800155b94b58e85d3abf017dce.