Revert "Remove sticky fix as a new fix is in Cornerstone."

This reverts commit deddb9ad40459d78afabc9ae017b87fcfffd552d.