This reverts commit e6b1dc45e1. This is not ready yet and it's causing failures in some environments (travis)
e6b1dc45e1