Revert "Request from Amber 1)-7)"

This reverts commit ebd3d6c2bacb96ba09e9c037a4506418c64ad206.