Revert a88c54f..c900cf7

This rolls back to commit a88c54f0b0d41720dba75d70b9a5631969bbfa68.