Revert Pillowtop changes
Merge pull request #4136 from dimagi/revert-pillowtop

Revert Pillowtop changes