Reverted bugfix