Revert "Revert patch"

This reverts commit 23d9eb7a0565f0203d325c9b9c2dde3e1e9b16a1.