Revert b0786bd..bdd3611

This rolls back to commit b0786bda728e8283cc4cdd7f3e33266cd45c0754.