Revert to original version from March 24