Revert b0a3bce..2016571

This rolls back to commit b0a3bce0d32bce00cbd1e0bf2f1a5047a73f0333.