was 100% caused by the shield button removal, as my build that is just next but with all the shield reversions reverted demonstrates the correct behaviour:
next