Revert d0379cd..5da82b9

This rolls back to commit d0379cd5fd392fd4b7e31db276d1d8706bc2aaec.