Revert 21c7bd9..8824e78

This rolls back to commit 21c7bd9266e300b682ab255efd87d0a89a8f5e2c.