Revert faa4bc5..02bb7eb

This rolls back to commit faa4bc598af25ee1a6ffa4e6786ee88b76632a58.