Revert "cont'd 2"

This reverts commit 2cb3de2d287e221edac07b63defc1a3d682aedaa.