Revert "Revert "Revert "Revert "Revert ":alien:"""""

This reverts commit bc7d6201ef41f124a6871a5d3a15fda5da342861.