Revert 4c94ac5..0124976

This rolls back to commit 4c94ac5f3f6752895d9a7a35306e3169daf33ecb.