Revert "Merge branch 'refs/heads/notifiable_0_18_0' into dev"

This reverts commit 9d3bbfe4326828d6eba75cfdaab876dc86e56446, reversing
changes made to e9b0821ac0f5a70f7a2a7e96dc9d45dcb939b739.