partially reverted the previous commit (does not work with Composer)