Revert "[mr2596] Reflectable Patch -"

This reverts commit f9d718b0832d85bd0e0d0f391151f7a4fca466a5.