Removed too much code in a previous commit
- Fixed regression