Revert "Merge branch 'master' into rnbwd"

This reverts commit 5b36f290621f4e86226eeeed5b30ed47d9a88116, reversing
changes made to 356177d8798b37a391aa5bba8f5e4170630383b1.

Conflicts:
	npm-shrinkwrap.json
	package.yaml