Remove bugfix, now pushed to core