Reverted last bugfix