Revert aa930b6..b59196b

This rolls back to commit aa930b62dc75d2adafaf22cdfe99456ad5dcba97.