Revert 16393e6..f689519

This rolls back to commit 16393e6b7a089ef7d42c021828651d953978fa87.