Revert a969938..343efc5

This rolls back to commit a969938cfbb651b1432a8708646305b0face48b6.