Revert ac6505b..4a57954

This rolls back to commit ac6505b3302ae9faec81f51c40301c302e5aa823.