Revert 0d5faad..0b91f02

This rolls back to commit 0d5faad888ddcbccc098a55341b57f1ae4a6be6f.
9.18