Revert "Merge remote-tracking branch 'schmittjoh/master'"

This reverts commit dfa0f04a01fb8b3612786511f989805f131ec5a9, reversing
changes made to 45a3a686bbf6d9afa9806c55db366e25ca575b82.