Revert 40bfe1d..0c55e94

This rolls back to commit 40bfe1d55260f5d0475645911e025b6a9179b477.