Just an update: Both #2 & #3 did not work for me on 8.x-2.x.