Revert to 5af6ac1b753f6bab24d5ab35cdc712384395a774