Revert 04b4f00..9c5627a

This rolls back to commit 04b4f0065d450fbe3e0505d8b13466fb944390cc.