Revert aa6fb85..a4a194c

This rolls back to commit aa6fb858f16154a57acb99979deabde78d519c83.