Core:\n- Reverted a change done to selector due to a new issue that we're working on fixing.