Revert e783573..4c25f89

This rolls back to commit e783573a8201c4172f3df543d6c8305068eb5944.