Revert d02e58b..a78d4a5

This rolls back to commit d02e58bdb5889e552ba384accf26fe0baa68a915.