Revert e19a665..8a0bbae

This rolls back to commit e19a6657e4f60548adb59d7f3211bf594bc881ae.