Revert 7a15330..b525694

This rolls back to commit 7a15330e676e45e310a96f3c7d65f2fa2300b7da.