9bf0d014d5
Remove duplicate method, include all needed annotations (seems that some of them were forgotten in either of the two methods)