Revert 5f6aac5..167c172

This rolls back to commit 5f6aac5df1ba901894457d55d4bce720ae9ccbbb.