Revert a7f1bc4..6ffb804

This rolls back to commit a7f1bc422215a41b5ec6bb4d23fcbcbc5b6068fe.