AMEC-2134 per Sebastian's tweaks.