Revert e6bfb80..c8bfae9

This rolls back to commit e6bfb80d2ddd7379fdce7a9c86f6fc7c3b99db95.