Revert b5c8956..cc87708

This rolls back to commit b5c8956d8b0b435c64a9ed30df07ffd06b975cde.