Revert 441e42d8034d0b88819bc41900e2ccc8281c9c42 (CC @anthonygerrard)