Revert 42128d1..c380067

This rolls back to commit 42128d1b30c52eb63fe3b56a8300e0aa2205d0e6.