I reverted that part of this change, as it was causing weird issues