Revert "Merge branch 'master' into ollie"

This reverts commit ad6a2a0192843f79f910df2230b1c0aa0a5ae168, reversing
changes made to a86e6f01547a753c074c196776dfc3e0fb56ebd2.