Revert "merging master and styles branches"

This reverts commit cc935f2451157f76eedbff0f41ba70aa4a28f815, reversing
changes made to f6cdf3de0abcd64ca5b06e881d615019efdf4c95.