Revert 32c2df3..0612e49

This rolls back to commit 32c2df33d4255b432658048e31656c63de7f0d2c.