Revert 52963a8..4e24db0

This rolls back to commit 52963a8fd71efb5b3d55f542eaec8b11bb1d67fa.