Revert 32c2df3..49b7f20

This rolls back to commit 32c2df33d4255b432658048e31656c63de7f0d2c.