Revert bd63301..02cfde2

This rolls back to commit bd6330124917b8753e19347fd032cbad0c8ac2e6.