Revert 5e9fdd9..c415c61

This rolls back to commit 5e9fdd92d90dbad9bf1ad107ef4c781281f979a0.