Revert 0f2425e..c9850b5

This rolls back to commit 0f2425e2df10a4314634fe1141d239cb3b75bfa5.