Revert 81cf332..0b3551d

This rolls back to commit 81cf33242ffa396e33291631a37e7ec8588c10db.