Revert 5e0df12..f139768

This rolls back to commit 5e0df122d4768c89d9630261117d625487bb667b.