Reverted as per existing fix, and added a message.