Revert e5c6f5f..f3c759a

This rolls back to commit e5c6f5f02f7b361bd4ae7f3f881264ea71834887.