Revert to 4c95743