Revert a4469d6..1bfaa8a

This rolls back to commit a4469d6d3a52aff003fdb141b039db787e80c8b2.