Revert e58076b..83082f9

This rolls back to commit e58076b71b3a6c32e0147c48313370eea391959e.