Revert e550269..083b85e

This rolls back to commit e550269755458882a2ccc0331c7b888471882d0e.