Revert e037745..14444b6

This rolls back to commit e0377456f4d9345ed819ed10c59ba46a464f8f24.