Revert 357d144..574721d

This rolls back to commit 357d144a7681b73dff1f1c05cbbcb647c68b994a.