Revert ae7ed48..5a7bac8

This rolls back to commit ae7ed4888ebbc38b2f8102eb395da91aefa8c773.