... and reverted one earlier change which isn't necessary anymore.