Revert 8babdde..f6c3a7b

This rolls back to commit 8babdded3f98d1d2d3b0cb267c7013991038fa70.