Revert 9cecfaf..b7cc1fa

This rolls back to commit 9cecfaf2028141df2fe3bf1628e1c6d1076498ab.