Revert to commit f59ba1c9c7046d08c8f4331881696da9b50d1b26.