Remove workarounds, rock is smart enough now