Reverted a change I made previously - it causes too many problems