Revert fff09dd..6cfd837

This rolls back to commit fff09dd56d027bd07d960bfc9d875ff69a02b929.