Fixed: Removed temporary fix (regression)
Small fixes