Revert "Adding support for v1.4"

This reverts commit f860cba3e236cc8ecac3f32eb3414f8cb6e16e5d.