Revert 7cc9172..174fae6

This rolls back to commit 7cc917253e90306a1d3cdaac1610c98f5ffa0f94.