Revert 5f71ccd..c9cb53d

This rolls back to commit 5f71ccdfca75f948e152b069fb41293228b9c023.