Revert to e97a8c899b740aabffa82ed4ba8c7b5e582f77db
Fixed Ian's commit