Revert f917770..56f2fa9

This rolls back to commit f9177707ea8c879ffbf8598af0aef52db048dbc1.