Revert bd2d826..71e1c8d

This rolls back to commit bd2d826f2f06a4e6ddc02d661e12699be9ed9b8a.