Revert 8b867a6..88196ce

This rolls back to commit 8b867a692ece7651c38d6974ba01a7613b4971b2.
Merge branch 'master' into sam-branch