Revert "1.5.0.18 dev"

This reverts commit ef1705748cd9dd4f9a8c4195536cf3e36801e3c6.