Rolled back mistaken bugfix