Revert tweaks unrelated to stylus @require support

From 26ea2f94b0be8e13f901c5e4ce1c5e8f0baa136a