Revert 938e042..920bf77

This rolls back to commit 938e042bcf230ba3f3e15b48bedfee66ecead277.