Revert bd8dec6..89a6336

This rolls back to commit bd8dec659ea65abdc28adf9c44939d9764e64d15.
-e switch added