Revert b17ad54..314d663

This rolls back to commit b17ad540ec025bd9e7b4de0f1b7c11353c220522.