Revert e9abe2a..1bbf6f6

This rolls back to commit e9abe2af255a7535578d2954c384a29e5e1808a3.