Revert ce1a2b8..b902e2e

This rolls back to commit ce1a2b88797ee70842291c1591b832291ac92ce4.