Revert e4765d0..1e6ddb5

This rolls back to commit e4765d0248986ede965d2ece1af140059f3938f4.