Revert 6831912..387c99c

This rolls back to commit 6831912def94f53a9469e082f6d60b0e3f8ccf38.