Revert 9726462..ccd661a

This rolls back to commit 9726462cfc645f82bfbf32eea6606dc6520fb5ec.
Revert "Revert 9726462..ccd661a"

This reverts commit 703543365cd5844921689985ee619b751c393507.