Revert 316ca93..7f2a200

This rolls back to commit 316ca93d02db31e542d0851e4cbd10c30e6d0f60.