Revert aa85c2f..b994bb0

This rolls back to commit aa85c2f161944421fa5233794d3e5d5731479170.