Revert 9895052..6846ee7

This rolls back to commit 9895052df0a12c201ce290040ecc6338cdafaa78.