Revert fc24820..776d24e

This rolls back to commit fc24820d5bee475aea0b3936ebd4c4e7f109209a.