Revert e7a748d..c8755b6

This rolls back to commit e7a748dc8425fa5ad258c13c79d01766083a8061.