Rollback changes introduced in d5dbce4