Revert a804394..c0dfe5f

This rolls back to commit a804394482a463b9bec618b213c2b1ecd831a785.