Revert b78a4b3..70e398e

This rolls back to commit b78a4b36cc3ebb8658802735381f25d43b7a856d.