Revert 78e0c30..5e41bd3

This rolls back to commit 78e0c3074e39c6c0b333a6a02b81e858564dfb82.