[#830] Reverted changes to requirements setup