Reverted, this caused bugs.