Revert 180617e..9694c02

This rolls back to commit 180617e38cc2ec5e67ffd4fb3dee6bc5ee53f68d.