Revert 7b860c7..ab7f4ec

This rolls back to commit 7b860c7b65bc216256738c901df1b0f013938b1c.