Revert ac8221b..b8c332a

This rolls back to commit ac8221b6f7093668634c635da94a4b901a981440.