Revert b055eb9..b998a2d

This rolls back to commit b055eb968046e4eae07631eebf1948340547f1d5.