Revert 73398e0..94aa21f

This rolls back to commit 73398e0158941570b4fc5cab61e4f50c01102a95.