Revert "1.5 - head"

This reverts commit fbbc37cf6cefe7ef6776f6f3d6655698064a474d.