Revert "Accepting @jcw's changes?"

This reverts commit c8820c8021181d3bcee2b5459e04f81cf8c5fcdb.