Revert f7924ac..f61f654

This rolls back to commit f7924ac37d0122ddfdfe1ecaf0551efbd7b0a575.