Issue #3507 - Aegir compatibility.

RTBC fix