Revert 6fd9758..3989470

This rolls back to commit 6fd9758a22892ecd8a8f7e40344558ca2309b581.