Revert bd6c750..b6386a0

This rolls back to commit bd6c750101e4f564722e8af98cceedb0693c02cb.