Revert to ee364158fc451e04a0a617f47f96dd1565976edb