Revert 29c24f3..2b09729

This rolls back to commit 29c24f37405e9762a37d76aca18be022daf09e45.