Revert for bugfix