Revert 5f709a0..f83acc3

This rolls back to commit 5f709a035c8905fedd190019d4611a900a2912e0.